css: Get the icon theme via the settings
authorMatthias Clasen <mclasen@redhat.com>
Wed, 22 Apr 2020 00:41:59 +0000 (20:41 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 22 Apr 2020 16:35:30 +0000 (12:35 -0400)
We don't have a css value for it anymore, but we
still need the current icon theme to interpret
icon names.

gtk/gtkcssimageicontheme.c

index 4fed08546b73f12978081d327039ff697d9a187a..08fd70a61fbb188e07b9cdda954dbb92c3e6a6ac 100644 (file)
@@ -145,10 +145,14 @@ gtk_css_image_icon_theme_compute (GtkCssImage      *image,
 {
   GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image);
   GtkCssImageIconTheme *copy;
+  GtkSettings *settings;
+  GdkDisplay *display;
 
   copy = g_object_new (GTK_TYPE_CSS_IMAGE_ICON_THEME, NULL);
   copy->name = g_strdup (icon_theme->name);
-  copy->icon_theme = icon_theme->icon_theme;
+  settings = gtk_style_provider_get_settings (provider);
+  display = _gtk_settings_get_display (settings);
+  copy->icon_theme = gtk_icon_theme_get_for_display (display);
   copy->scale = gtk_style_provider_get_scale (provider);
   gtk_icon_theme_lookup_symbolic_colors (style, &copy->color, &copy->success, &copy->warning, &copy->error);